@ttoss/appsync-api 0.17.11 → 0.18.0

package/README.md

@@ -98,3 +98,38 @@ export const handler = createAppSyncResolverHandler({
   middlewares: [permissions],
 });
 ```
+
+### Custom domain name
+
+You can add a custom domain name to your API using the `customDomain` option.
+
+```ts
+import { createApiTemplate } from '@ttoss/appsync-api';
+
+export const handler = createApiTemplate({
+  schemaComposer,
+  customDomain: {
+    domainName: 'api.example.com', // required
+    certificateArn: {
+      'Fn::ImportValue': 'AppSyncDomainCertificateArn',
+    }, // required
+  },
+});
+```
+
+If your domain is on Route53, you can use the option `customDomain.hostedZoneName` to create the required DNS records.
+
+```ts
+import { createApiTemplate } from '@ttoss/appsync-api';
+
+export const template = createApiTemplate({
+  schemaComposer,
+  customDomain: {
+    domainName: 'api.example.com', // required
+    certificateArn: {
+      'Fn::ImportValue': 'AppSyncDomainCertificateArn',
+    }, // required
+    hostedZoneName: 'example.com.', // optional
+  },
+});
+```

package/dist/esm/index.js

@@ -2,128 +2,6 @@
 
 // src/createApiTemplate.ts
 import { graphql } from "@ttoss/graphql-api";
-
-// ../../node_modules/.pnpm/tslib@2.6.2/node_modules/tslib/tslib.es6.mjs
-var __assign = function () {
-  __assign = Object.assign || function __assign2(t) {
-    for (var s, i = 1, n = arguments.length; i < n; i++) {
-      s = arguments[i];
-      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-    }
-    return t;
-  };
-  return __assign.apply(this, arguments);
-};
-
-// ../../node_modules/.pnpm/lower-case@2.0.2/node_modules/lower-case/dist.es2015/index.js
-function lowerCase(str) {
-  return str.toLowerCase();
-}
-
-// ../../node_modules/.pnpm/no-case@3.0.4/node_modules/no-case/dist.es2015/index.js
-var DEFAULT_SPLIT_REGEXP = [/([a-z0-9])([A-Z])/g, /([A-Z])([A-Z][a-z])/g];
-var DEFAULT_STRIP_REGEXP = /[^A-Z0-9]+/gi;
-function noCase(input, options) {
-  if (options === void 0) {
-    options = {};
-  }
-  var _a = options.splitRegexp,
-    splitRegexp = _a === void 0 ? DEFAULT_SPLIT_REGEXP : _a,
-    _b = options.stripRegexp,
-    stripRegexp = _b === void 0 ? DEFAULT_STRIP_REGEXP : _b,
-    _c = options.transform,
-    transform = _c === void 0 ? lowerCase : _c,
-    _d = options.delimiter,
-    delimiter = _d === void 0 ? " " : _d;
-  var result = replace(replace(input, splitRegexp, "$1\0$2"), stripRegexp, "\0");
-  var start = 0;
-  var end = result.length;
-  while (result.charAt(start) === "\0") start++;
-  while (result.charAt(end - 1) === "\0") end--;
-  return result.slice(start, end).split("\0").map(transform).join(delimiter);
-}
-function replace(input, re, value) {
-  if (re instanceof RegExp) return input.replace(re, value);
-  return re.reduce(function (input2, re2) {
-    return input2.replace(re2, value);
-  }, input);
-}
-
-// ../../node_modules/.pnpm/pascal-case@3.1.2/node_modules/pascal-case/dist.es2015/index.js
-function pascalCaseTransform(input, index) {
-  var firstChar = input.charAt(0);
-  var lowerChars = input.substr(1).toLowerCase();
-  if (index > 0 && firstChar >= "0" && firstChar <= "9") {
-    return "_" + firstChar + lowerChars;
-  }
-  return "" + firstChar.toUpperCase() + lowerChars;
-}
-function pascalCase(input, options) {
-  if (options === void 0) {
-    options = {};
-  }
-  return noCase(input, __assign({
-    delimiter: "",
-    transform: pascalCaseTransform
-  }, options));
-}
-
-// ../carlin/src/deploy/lambdaLayer/getPackageLambdaLayerStackName.ts
-var lambdaLayerStackNamePrefix = `LambdaLayer`;
-var getPackageLambdaLayerStackName = packageName => {
-  const [scopedName, version] = packageName.split("@").filter(part => {
-    return !!part;
-  });
-  return [lambdaLayerStackNamePrefix, pascalCase(scopedName), version.replace(/[^0-9.]/g, "").replace(/\./g, "-")].join("-");
-};
-
-// package.json
-var package_default = {
-  name: "@ttoss/appsync-api",
-  version: "0.17.11",
-  description: "A library for building GraphQL APIs for AWS AppSync.",
-  author: "ttoss",
-  contributors: ["Pedro Arantes <pedro@arantespp.com> (https://arantespp.com)"],
-  repository: {
-    type: "git",
-    url: "https://github.com/ttoss/ttoss.git",
-    directory: "packages/appsync-api"
-  },
-  main: "dist/index.js",
-  module: "dist/esm/index.js",
-  files: ["dist", "src"],
-  scripts: {
-    build: "tsup",
-    test: "jest"
-  },
-  sideEffects: false,
-  typings: "dist/index.d.ts",
-  dependencies: {
-    "@ttoss/cloudformation": "workspace:^"
-  },
-  peerDependencies: {
-    "@ttoss/graphql-api": "workspace:^",
-    graphql: "^16.6.0"
-  },
-  devDependencies: {
-    "@ttoss/config": "workspace:^",
-    "@ttoss/graphql-api": "workspace:^",
-    "@ttoss/relay-amplify": "workspace:^",
-    "@types/aws-lambda": "^8.10.130",
-    carlin: "workspace:^",
-    graphql: "^16.8.1",
-    "graphql-shield": "^7.6.5",
-    jest: "^29.7.0",
-    tsup: "^8.0.1"
-  },
-  keywords: ["api", "appsync", "aws", "graphql"],
-  publishConfig: {
-    access: "public",
-    provenance: true
-  }
-};
-
-// src/createApiTemplate.ts
 var AppSyncGraphQLApiLogicalId = "AppSyncGraphQLApi";
 var AppSyncGraphQLSchemaLogicalId = "AppSyncGraphQLSchema";
 var AppSyncLambdaFunctionLogicalId = "AppSyncLambdaFunction";
@@ -135,7 +13,8 @@ var createApiTemplate = ({
   schemaComposer,
   dataSource,
   lambdaFunction,
-  userPoolConfig
+  userPoolConfig,
+  customDomain
 }) => {
   const sdlWithoutComments = schemaComposer.toSDL({
     commentDescriptions: false,
@@ -158,21 +37,6 @@ var createApiTemplate = ({
       };
     });
   }).filter(Boolean);
-  const getPeerDependenciesLambdaLayers = () => {
-    const {
-      peerDependencies
-    } = package_default;
-    const lambdaLayerStackNames = Object.entries(peerDependencies).filter(([dependencyName]) => {
-      return ["graphql"].includes(dependencyName);
-    }).map(([dependencyName, dependencyVersion]) => {
-      return getPackageLambdaLayerStackName([dependencyName, dependencyVersion].join("@"));
-    });
-    return lambdaLayerStackNames.map(lambdaLayerStackName => {
-      return {
-        "Fn::ImportValue": lambdaLayerStackName
-      };
-    });
-  };
   const template = {
     AWSTemplateFormatVersion: "2010-09-09",
     Parameters: {
@@ -228,10 +92,10 @@ var createApiTemplate = ({
             }
           },
           Handler: "index.handler",
-          Layers: getPeerDependenciesLambdaLayers(),
+          Layers: lambdaFunction.layers,
           MemorySize: 512,
           Role: lambdaFunction.roleArn,
-          Runtime: "nodejs18.x",
+          Runtime: "nodejs20.x",
           /**
            * https://docs.aws.amazon.com/general/latest/gr/appsync.html
            * Request execution time for mutations, queries, and subscriptions: 30 seconds
@@ -345,6 +209,58 @@ var createApiTemplate = ({
       Variables: lambdaFunction.environment.variables
     };
   }
+  if (customDomain) {
+    const AppSyncDomainNameLogicalId = "AppSyncDomainName";
+    template.Resources[AppSyncDomainNameLogicalId] = {
+      Type: "AWS::AppSync::DomainName",
+      Properties: {
+        CertificateArn: customDomain.certificateArn,
+        Description: "Custom domain for AppSync API",
+        DomainName: customDomain.domainName
+      }
+    };
+    if (customDomain.hostedZoneName) {
+      const hostedZoneName = customDomain.hostedZoneName.endsWith(".") ? customDomain.hostedZoneName : `${customDomain.hostedZoneName}.`;
+      template.Resources.AppSyncDomainNameRoute53RecordSet = {
+        Type: "AWS::Route53::RecordSet",
+        Properties: {
+          HostedZoneName: hostedZoneName,
+          Name: customDomain.domainName,
+          ResourceRecords: [{
+            "Fn::GetAtt": [AppSyncDomainNameLogicalId, "AppSyncDomainName"]
+          }],
+          TTL: "900",
+          Type: "CNAME"
+        }
+      };
+    }
+    template.Resources.AppSyncDomainNameApiAssociation = {
+      Type: "AWS::AppSync::DomainNameApiAssociation",
+      Properties: {
+        ApiId: {
+          "Fn::GetAtt": [AppSyncGraphQLApiLogicalId, "ApiId"]
+        },
+        DomainName: {
+          "Fn::GetAtt": [AppSyncDomainNameLogicalId, "DomainName"]
+        }
+      }
+    };
+    if (!template.Outputs) {
+      template.Outputs = {};
+    }
+    template.Outputs.DomainName = {
+      Description: "Custom domain name for AppSync API",
+      Value: {
+        "Fn::GetAtt": [AppSyncDomainNameLogicalId, "DomainName"]
+      }
+    };
+    template.Outputs.CloudFrontDomainName = {
+      Description: "CloudFront domain name for AppSync API",
+      Value: {
+        "Fn::GetAtt": [AppSyncDomainNameLogicalId, "AppSyncDomainName"]
+      }
+    };
+  }
   return template;
 };
 
@@ -361,6 +277,9 @@ var createAppSyncResolverHandler = ({
   ...buildSchemaInput
 }) => {
   return async (event, context) => {
+    const {
+      schemaComposer
+    } = buildSchemaInput;
     const {
       info,
       arguments: args,
@@ -389,7 +308,32 @@ var createAppSyncResolverHandler = ({
     if (!resolver) {
       throw new Error(`Resolver for ${parentTypeName}.${fieldName} not found`);
     }
-    const response = await resolver(source, args, {
+    const argsWithEnumValues = (() => {
+      const fieldsArgsIsEnumType = field.args.filter(arg => {
+        return schemaComposer.isEnumType(arg.type);
+      });
+      const enumArgs = fieldsArgsIsEnumType.map(enumArg => {
+        if (!args[enumArg.name]) {
+          return {
+            [enumArg.name]: enumArg.defaultValue
+          };
+        }
+        const values = schemaComposer.getETC(enumArg.type).getFields();
+        return {
+          [enumArg.name]: values[args[enumArg.name]].value
+        };
+      }).reduce((acc, curr) => {
+        return {
+          ...acc,
+          ...curr
+        };
+      }, {});
+      return {
+        ...args,
+        ...enumArgs
+      };
+    })();
+    const response = await resolver(source, argsWithEnumValues, {
       ...context,
       identity: event.identity,
       credentials,

package/dist/index.d.mts

@@ -87,10 +87,14 @@ type StringOrImport = string | {
  * https://docs.aws.amazon.com/appsync/latest/devguide/security-authz.html
  */
 type AuthenticationType = 'API_KEY' | 'AWS_LAMBDA' | 'AWS_IAM' | 'OPENID_CONNECT' | 'AMAZON_COGNITO_USER_POOLS';
-declare const createApiTemplate: ({ additionalAuthenticationProviders, authenticationType, schemaComposer, dataSource, lambdaFunction, userPoolConfig, }: {
+declare const createApiTemplate: ({ additionalAuthenticationProviders, authenticationType, schemaComposer, dataSource, lambdaFunction, userPoolConfig, customDomain, }: {
     additionalAuthenticationProviders?: AuthenticationType[] | undefined;
     authenticationType?: AuthenticationType | undefined;
-    schemaComposer: SchemaComposer<any>;
+    customDomain?: {
+        domainName: string;
+        certificateArn: string;
+        hostedZoneName?: string | undefined;
+    } | undefined;
     dataSource: {
         roleArn: StringOrImport;
     };
@@ -98,8 +102,10 @@ declare const createApiTemplate: ({ additionalAuthenticationProviders, authentic
         environment?: {
             variables: Record<string, string>;
         };
+        layers?: any;
         roleArn: StringOrImport;
     };
+    schemaComposer: SchemaComposer<any>;
     userPoolConfig?: {
         appIdClientRegex: StringOrImport;
         awsRegion: StringOrImport;

package/dist/index.d.ts

@@ -87,10 +87,14 @@ type StringOrImport = string | {
  * https://docs.aws.amazon.com/appsync/latest/devguide/security-authz.html
  */
 type AuthenticationType = 'API_KEY' | 'AWS_LAMBDA' | 'AWS_IAM' | 'OPENID_CONNECT' | 'AMAZON_COGNITO_USER_POOLS';
-declare const createApiTemplate: ({ additionalAuthenticationProviders, authenticationType, schemaComposer, dataSource, lambdaFunction, userPoolConfig, }: {
+declare const createApiTemplate: ({ additionalAuthenticationProviders, authenticationType, schemaComposer, dataSource, lambdaFunction, userPoolConfig, customDomain, }: {
     additionalAuthenticationProviders?: AuthenticationType[] | undefined;
     authenticationType?: AuthenticationType | undefined;
-    schemaComposer: SchemaComposer<any>;
+    customDomain?: {
+        domainName: string;
+        certificateArn: string;
+        hostedZoneName?: string | undefined;
+    } | undefined;
     dataSource: {
         roleArn: StringOrImport;
     };
@@ -98,8 +102,10 @@ declare const createApiTemplate: ({ additionalAuthenticationProviders, authentic
         environment?: {
             variables: Record<string, string>;
         };
+        layers?: any;
         roleArn: StringOrImport;
     };
+    schemaComposer: SchemaComposer<any>;
     userPoolConfig?: {
         appIdClientRegex: StringOrImport;
         awsRegion: StringOrImport;

package/dist/index.js

@@ -34,128 +34,6 @@ module.exports = __toCommonJS(src_exports);
 
 // src/createApiTemplate.ts
 var import_graphql_api = require("@ttoss/graphql-api");
-
-// ../../node_modules/.pnpm/tslib@2.6.2/node_modules/tslib/tslib.es6.mjs
-var __assign = function () {
-  __assign = Object.assign || function __assign2(t) {
-    for (var s, i = 1, n = arguments.length; i < n; i++) {
-      s = arguments[i];
-      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-    }
-    return t;
-  };
-  return __assign.apply(this, arguments);
-};
-
-// ../../node_modules/.pnpm/lower-case@2.0.2/node_modules/lower-case/dist.es2015/index.js
-function lowerCase(str) {
-  return str.toLowerCase();
-}
-
-// ../../node_modules/.pnpm/no-case@3.0.4/node_modules/no-case/dist.es2015/index.js
-var DEFAULT_SPLIT_REGEXP = [/([a-z0-9])([A-Z])/g, /([A-Z])([A-Z][a-z])/g];
-var DEFAULT_STRIP_REGEXP = /[^A-Z0-9]+/gi;
-function noCase(input, options) {
-  if (options === void 0) {
-    options = {};
-  }
-  var _a = options.splitRegexp,
-    splitRegexp = _a === void 0 ? DEFAULT_SPLIT_REGEXP : _a,
-    _b = options.stripRegexp,
-    stripRegexp = _b === void 0 ? DEFAULT_STRIP_REGEXP : _b,
-    _c = options.transform,
-    transform = _c === void 0 ? lowerCase : _c,
-    _d = options.delimiter,
-    delimiter = _d === void 0 ? " " : _d;
-  var result = replace(replace(input, splitRegexp, "$1\0$2"), stripRegexp, "\0");
-  var start = 0;
-  var end = result.length;
-  while (result.charAt(start) === "\0") start++;
-  while (result.charAt(end - 1) === "\0") end--;
-  return result.slice(start, end).split("\0").map(transform).join(delimiter);
-}
-function replace(input, re, value) {
-  if (re instanceof RegExp) return input.replace(re, value);
-  return re.reduce(function (input2, re2) {
-    return input2.replace(re2, value);
-  }, input);
-}
-
-// ../../node_modules/.pnpm/pascal-case@3.1.2/node_modules/pascal-case/dist.es2015/index.js
-function pascalCaseTransform(input, index) {
-  var firstChar = input.charAt(0);
-  var lowerChars = input.substr(1).toLowerCase();
-  if (index > 0 && firstChar >= "0" && firstChar <= "9") {
-    return "_" + firstChar + lowerChars;
-  }
-  return "" + firstChar.toUpperCase() + lowerChars;
-}
-function pascalCase(input, options) {
-  if (options === void 0) {
-    options = {};
-  }
-  return noCase(input, __assign({
-    delimiter: "",
-    transform: pascalCaseTransform
-  }, options));
-}
-
-// ../carlin/src/deploy/lambdaLayer/getPackageLambdaLayerStackName.ts
-var lambdaLayerStackNamePrefix = `LambdaLayer`;
-var getPackageLambdaLayerStackName = packageName => {
-  const [scopedName, version] = packageName.split("@").filter(part => {
-    return !!part;
-  });
-  return [lambdaLayerStackNamePrefix, pascalCase(scopedName), version.replace(/[^0-9.]/g, "").replace(/\./g, "-")].join("-");
-};
-
-// package.json
-var package_default = {
-  name: "@ttoss/appsync-api",
-  version: "0.17.11",
-  description: "A library for building GraphQL APIs for AWS AppSync.",
-  author: "ttoss",
-  contributors: ["Pedro Arantes <pedro@arantespp.com> (https://arantespp.com)"],
-  repository: {
-    type: "git",
-    url: "https://github.com/ttoss/ttoss.git",
-    directory: "packages/appsync-api"
-  },
-  main: "dist/index.js",
-  module: "dist/esm/index.js",
-  files: ["dist", "src"],
-  scripts: {
-    build: "tsup",
-    test: "jest"
-  },
-  sideEffects: false,
-  typings: "dist/index.d.ts",
-  dependencies: {
-    "@ttoss/cloudformation": "workspace:^"
-  },
-  peerDependencies: {
-    "@ttoss/graphql-api": "workspace:^",
-    graphql: "^16.6.0"
-  },
-  devDependencies: {
-    "@ttoss/config": "workspace:^",
-    "@ttoss/graphql-api": "workspace:^",
-    "@ttoss/relay-amplify": "workspace:^",
-    "@types/aws-lambda": "^8.10.130",
-    carlin: "workspace:^",
-    graphql: "^16.8.1",
-    "graphql-shield": "^7.6.5",
-    jest: "^29.7.0",
-    tsup: "^8.0.1"
-  },
-  keywords: ["api", "appsync", "aws", "graphql"],
-  publishConfig: {
-    access: "public",
-    provenance: true
-  }
-};
-
-// src/createApiTemplate.ts
 var AppSyncGraphQLApiLogicalId = "AppSyncGraphQLApi";
 var AppSyncGraphQLSchemaLogicalId = "AppSyncGraphQLSchema";
 var AppSyncLambdaFunctionLogicalId = "AppSyncLambdaFunction";
@@ -167,7 +45,8 @@ var createApiTemplate = ({
   schemaComposer,
   dataSource,
   lambdaFunction,
-  userPoolConfig
+  userPoolConfig,
+  customDomain
 }) => {
   const sdlWithoutComments = schemaComposer.toSDL({
     commentDescriptions: false,
@@ -190,21 +69,6 @@ var createApiTemplate = ({
       };
     });
   }).filter(Boolean);
-  const getPeerDependenciesLambdaLayers = () => {
-    const {
-      peerDependencies
-    } = package_default;
-    const lambdaLayerStackNames = Object.entries(peerDependencies).filter(([dependencyName]) => {
-      return ["graphql"].includes(dependencyName);
-    }).map(([dependencyName, dependencyVersion]) => {
-      return getPackageLambdaLayerStackName([dependencyName, dependencyVersion].join("@"));
-    });
-    return lambdaLayerStackNames.map(lambdaLayerStackName => {
-      return {
-        "Fn::ImportValue": lambdaLayerStackName
-      };
-    });
-  };
   const template = {
     AWSTemplateFormatVersion: "2010-09-09",
     Parameters: {
@@ -260,10 +124,10 @@ var createApiTemplate = ({
             }
           },
           Handler: "index.handler",
-          Layers: getPeerDependenciesLambdaLayers(),
+          Layers: lambdaFunction.layers,
           MemorySize: 512,
           Role: lambdaFunction.roleArn,
-          Runtime: "nodejs18.x",
+          Runtime: "nodejs20.x",
           /**
            * https://docs.aws.amazon.com/general/latest/gr/appsync.html
            * Request execution time for mutations, queries, and subscriptions: 30 seconds
@@ -377,6 +241,58 @@ var createApiTemplate = ({
       Variables: lambdaFunction.environment.variables
     };
   }
+  if (customDomain) {
+    const AppSyncDomainNameLogicalId = "AppSyncDomainName";
+    template.Resources[AppSyncDomainNameLogicalId] = {
+      Type: "AWS::AppSync::DomainName",
+      Properties: {
+        CertificateArn: customDomain.certificateArn,
+        Description: "Custom domain for AppSync API",
+        DomainName: customDomain.domainName
+      }
+    };
+    if (customDomain.hostedZoneName) {
+      const hostedZoneName = customDomain.hostedZoneName.endsWith(".") ? customDomain.hostedZoneName : `${customDomain.hostedZoneName}.`;
+      template.Resources.AppSyncDomainNameRoute53RecordSet = {
+        Type: "AWS::Route53::RecordSet",
+        Properties: {
+          HostedZoneName: hostedZoneName,
+          Name: customDomain.domainName,
+          ResourceRecords: [{
+            "Fn::GetAtt": [AppSyncDomainNameLogicalId, "AppSyncDomainName"]
+          }],
+          TTL: "900",
+          Type: "CNAME"
+        }
+      };
+    }
+    template.Resources.AppSyncDomainNameApiAssociation = {
+      Type: "AWS::AppSync::DomainNameApiAssociation",
+      Properties: {
+        ApiId: {
+          "Fn::GetAtt": [AppSyncGraphQLApiLogicalId, "ApiId"]
+        },
+        DomainName: {
+          "Fn::GetAtt": [AppSyncDomainNameLogicalId, "DomainName"]
+        }
+      }
+    };
+    if (!template.Outputs) {
+      template.Outputs = {};
+    }
+    template.Outputs.DomainName = {
+      Description: "Custom domain name for AppSync API",
+      Value: {
+        "Fn::GetAtt": [AppSyncDomainNameLogicalId, "DomainName"]
+      }
+    };
+    template.Outputs.CloudFrontDomainName = {
+      Description: "CloudFront domain name for AppSync API",
+      Value: {
+        "Fn::GetAtt": [AppSyncDomainNameLogicalId, "AppSyncDomainName"]
+      }
+    };
+  }
   return template;
 };
 
@@ -393,6 +309,9 @@ var createAppSyncResolverHandler = ({
   ...buildSchemaInput
 }) => {
   return async (event, context) => {
+    const {
+      schemaComposer
+    } = buildSchemaInput;
     const {
       info,
       arguments: args,
@@ -421,7 +340,32 @@ var createAppSyncResolverHandler = ({
     if (!resolver) {
       throw new Error(`Resolver for ${parentTypeName}.${fieldName} not found`);
     }
-    const response = await resolver(source, args, {
+    const argsWithEnumValues = (() => {
+      const fieldsArgsIsEnumType = field.args.filter(arg => {
+        return schemaComposer.isEnumType(arg.type);
+      });
+      const enumArgs = fieldsArgsIsEnumType.map(enumArg => {
+        if (!args[enumArg.name]) {
+          return {
+            [enumArg.name]: enumArg.defaultValue
+          };
+        }
+        const values = schemaComposer.getETC(enumArg.type).getFields();
+        return {
+          [enumArg.name]: values[args[enumArg.name]].value
+        };
+      }).reduce((acc, curr) => {
+        return {
+          ...acc,
+          ...curr
+        };
+      }, {});
+      return {
+        ...args,
+        ...enumArgs
+      };
+    })();
+    const response = await resolver(source, argsWithEnumValues, {
       ...context,
       identity: event.identity,
       credentials,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ttoss/appsync-api",
-  "version": "0.17.11",
+  "version": "0.18.0",
   "description": "A library for building GraphQL APIs for AWS AppSync.",
   "author": "ttoss",
   "contributors": [
@@ -35,7 +35,7 @@
     "@ttoss/config": "^1.31.4",
     "@ttoss/graphql-api": "^0.5.0",
     "@ttoss/relay-amplify": "^0.5.4",
-    "carlin": "^1.31.7"
+    "carlin": "^1.31.8"
   },
   "keywords": [
     "api",

package/src/createApiTemplate.ts

@@ -1,6 +1,4 @@
 import { type SchemaComposer, graphql } from '@ttoss/graphql-api';
-import { getPackageLambdaLayerStackName } from 'carlin/src/deploy/lambdaLayer/getPackageLambdaLayerStackName';
-import packageJson from '../package.json';
 
 /**
  * Absolute path to avoid:
@@ -44,11 +42,15 @@ export const createApiTemplate = ({
   dataSource,
   lambdaFunction,
   userPoolConfig,
+  customDomain,
 }: {
   additionalAuthenticationProviders?: AuthenticationType[];
   authenticationType?: AuthenticationType;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  schemaComposer: SchemaComposer<any>;
+  customDomain?: {
+    domainName: string;
+    certificateArn: string;
+    hostedZoneName?: string;
+  };
   dataSource: {
     roleArn: StringOrImport;
   };
@@ -56,8 +58,12 @@ export const createApiTemplate = ({
     environment?: {
       variables: Record<string, string>;
     };
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    layers?: any;
     roleArn: StringOrImport;
   };
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  schemaComposer: SchemaComposer<any>;
   userPoolConfig?: {
     appIdClientRegex: StringOrImport;
     awsRegion: StringOrImport;
@@ -102,26 +108,6 @@ export const createApiTemplate = ({
     })
     .filter(Boolean) as Array<{ fieldName: string; typeName: string }>;
 
-  const getPeerDependenciesLambdaLayers = () => {
-    const { peerDependencies } = packageJson;
-
-    const lambdaLayerStackNames = Object.entries(peerDependencies)
-      .filter(([dependencyName]) => {
-        return ['graphql'].includes(dependencyName);
-      })
-      .map(([dependencyName, dependencyVersion]) => {
-        return getPackageLambdaLayerStackName(
-          [dependencyName, dependencyVersion].join('@')
-        );
-      });
-
-    return lambdaLayerStackNames.map((lambdaLayerStackName) => {
-      return {
-        'Fn::ImportValue': lambdaLayerStackName,
-      };
-    });
-  };
-
   const template: CloudFormationTemplate = {
     AWSTemplateFormatVersion: '2010-09-09',
     Parameters: {
@@ -169,10 +155,10 @@ export const createApiTemplate = ({
             S3ObjectVersion: { Ref: 'LambdaS3ObjectVersion' },
           },
           Handler: 'index.handler',
-          Layers: getPeerDependenciesLambdaLayers(),
+          Layers: lambdaFunction.layers,
           MemorySize: 512,
           Role: lambdaFunction.roleArn,
-          Runtime: 'nodejs18.x',
+          Runtime: 'nodejs20.x',
           /**
            * https://docs.aws.amazon.com/general/latest/gr/appsync.html
            * Request execution time for mutations, queries, and subscriptions: 30 seconds
@@ -300,5 +286,75 @@ export const createApiTemplate = ({
       };
   }
 
+  if (customDomain) {
+    const AppSyncDomainNameLogicalId = 'AppSyncDomainName';
+
+    /**
+     * https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-domainname.html
+     */
+    template.Resources[AppSyncDomainNameLogicalId] = {
+      Type: 'AWS::AppSync::DomainName',
+      Properties: {
+        CertificateArn: customDomain.certificateArn,
+        Description: 'Custom domain for AppSync API',
+        DomainName: customDomain.domainName,
+      },
+    };
+
+    if (customDomain.hostedZoneName) {
+      const hostedZoneName = customDomain.hostedZoneName.endsWith('.')
+        ? customDomain.hostedZoneName
+        : `${customDomain.hostedZoneName}.`;
+
+      /**
+       * https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-recordset.html
+       */
+      template.Resources.AppSyncDomainNameRoute53RecordSet = {
+        Type: 'AWS::Route53::RecordSet',
+        Properties: {
+          HostedZoneName: hostedZoneName,
+          Name: customDomain.domainName,
+          ResourceRecords: [
+            {
+              'Fn::GetAtt': [AppSyncDomainNameLogicalId, 'AppSyncDomainName'],
+            },
+          ],
+          TTL: '900',
+          Type: 'CNAME',
+        },
+      };
+    }
+
+    template.Resources.AppSyncDomainNameApiAssociation = {
+      Type: 'AWS::AppSync::DomainNameApiAssociation',
+      Properties: {
+        ApiId: {
+          'Fn::GetAtt': [AppSyncGraphQLApiLogicalId, 'ApiId'],
+        },
+        DomainName: {
+          'Fn::GetAtt': [AppSyncDomainNameLogicalId, 'DomainName'],
+        },
+      },
+    };
+
+    if (!template.Outputs) {
+      template.Outputs = {};
+    }
+
+    template.Outputs.DomainName = {
+      Description: 'Custom domain name for AppSync API',
+      Value: {
+        'Fn::GetAtt': [AppSyncDomainNameLogicalId, 'DomainName'],
+      },
+    };
+
+    template.Outputs.CloudFrontDomainName = {
+      Description: 'CloudFront domain name for AppSync API',
+      Value: {
+        'Fn::GetAtt': [AppSyncDomainNameLogicalId, 'AppSyncDomainName'],
+      },
+    };
+  }
+
   return template;
 };

package/src/createAppSyncResolverHandler.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import { BuildSchemaInput, buildSchema } from '@ttoss/graphql-api';
 import { type GraphQLObjectType } from 'graphql';
 import { decodeCredentials } from '@ttoss/relay-amplify/src/encodeCredentials';
@@ -6,13 +7,15 @@ import type { AppSyncResolverHandler as AwsAppSyncResolverHandler } from 'aws-la
 export type AppSyncResolverHandler<
   TArguments,
   TResult,
-  TSource = Record<string, any> | null
+  TSource = Record<string, any> | null,
 > = AwsAppSyncResolverHandler<TArguments, TResult, TSource>;
 
 export const createAppSyncResolverHandler = ({
   ...buildSchemaInput
 }: BuildSchemaInput): AppSyncResolverHandler<any, any, any> => {
   return async (event, context) => {
+    const { schemaComposer } = buildSchemaInput;
+
     const { info, arguments: args, source, request } = event;
 
     const { parentTypeName, fieldName } = info;
@@ -45,9 +48,44 @@ export const createAppSyncResolverHandler = ({
       throw new Error(`Resolver for ${parentTypeName}.${fieldName} not found`);
     }
 
+    /**
+     * `composeWithConnection` findMany resolver needs sort to be the enum
+     * value defined in the enum instead the enum name.
+     * For example, if the config `sort.ID_ASC.value` is `{ order : 'ASC' }`,
+     * then the value of the argument `sort` enm should be
+     * `{ order : 'ASC' }` instead of `'ID_ASC'`.
+     */
+    const argsWithEnumValues = (() => {
+      const fieldsArgsIsEnumType = field.args.filter((arg) => {
+        return schemaComposer.isEnumType(arg.type);
+      });
+
+      const enumArgs = fieldsArgsIsEnumType
+        .map((enumArg) => {
+          if (!args[enumArg.name]) {
+            return { [enumArg.name]: enumArg.defaultValue };
+          }
+
+          const values = schemaComposer.getETC(enumArg.type).getFields();
+
+          return {
+            [enumArg.name]: values[args[enumArg.name]].value,
+          };
+        })
+        .reduce((acc, curr) => {
+          return { ...acc, ...curr };
+        }, {});
+
+      /**
+       * If `args.sort` has sort name, i.e. `ID_ASC`, then `enumArgs` will
+       * replace it with the value of the enum, i.e. `{ order : 'ASC' }`.
+       */
+      return { ...args, ...enumArgs };
+    })();
+
     const response = await resolver(
       source,
-      args,
+      argsWithEnumValues,
       { ...context, identity: event.identity, credentials, headers },
       info as any
     );