@aws-amplify/graphql-api-construct 1.1.3 → 1.2.0-amplify-table-preview.0

package/node_modules/zod/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zod",
-  "version": "3.21.4",
+  "version": "3.22.4",
   "author": "Colin McDonnell <colin@colinhacks.com>",
   "repository": {
     "type": "git",
@@ -9,12 +9,18 @@
   "main": "./lib/index.js",
   "module": "./lib/index.mjs",
   "devDependencies": {
+    "@babel/core": "^7.22.5",
+    "@babel/preset-env": "^7.22.5",
+    "@babel/preset-typescript": "^7.22.5",
     "@rollup/plugin-typescript": "^8.2.0",
+    "@swc/core": "^1.3.66",
+    "@swc/jest": "^0.2.26",
     "@types/benchmark": "^2.1.0",
     "@types/jest": "^29.2.2",
     "@types/node": "14",
     "@typescript-eslint/eslint-plugin": "^5.15.0",
     "@typescript-eslint/parser": "^5.15.0",
+    "babel-jest": "^29.5.0",
     "benchmark": "^2.1.4",
     "dependency-cruiser": "^9.19.0",
     "eslint": "^8.11.0",
@@ -30,18 +36,19 @@
     "prettier": "^2.6.0",
     "pretty-quick": "^3.1.3",
     "rollup": "^2.70.1",
-    "ts-jest": "^29.0.3",
+    "ts-jest": "^29.1.0",
     "ts-morph": "^14.0.0",
     "ts-node": "^10.9.1",
     "tslib": "^2.3.1",
     "tsx": "^3.8.0",
-    "typescript": "~4.5.0"
+    "typescript": "~4.5.0",
+    "vitest": "^0.32.2"
   },
   "exports": {
     ".": {
+      "types": "./index.d.ts",
       "require": "./lib/index.js",
-      "import": "./lib/index.mjs",
-      "types": "./index.d.ts"
+      "import": "./lib/index.mjs"
     },
     "./package.json": "./package.json",
     "./locales/*": "./lib/locales/*"
@@ -68,25 +75,32 @@
     "src/*.ts": [
       "eslint --cache --fix",
       "prettier --ignore-unknown --write"
+    ],
+    "*.md": [
+      "prettier --ignore-unknown --write"
     ]
   },
   "scripts": {
-    "prettier:check": "prettier --check src/**/*.ts deno/lib/**/*.ts --no-error-on-unmatched-pattern",
-    "prettier:fix": "prettier --write src/**/*.ts deno/lib/**/*.ts --ignore-unknown --no-error-on-unmatched-pattern",
+    "prettier:check": "prettier --check src/**/*.ts deno/lib/**/*.ts *.md --no-error-on-unmatched-pattern",
+    "prettier:fix": "prettier --write src/**/*.ts deno/lib/**/*.ts *.md --ignore-unknown --no-error-on-unmatched-pattern",
     "lint:check": "eslint --cache --ext .ts ./src",
     "lint:fix": "eslint --cache --fix --ext .ts ./src",
     "check": "yarn lint:check && yarn prettier:check",
     "fix": "yarn lint:fix && yarn prettier:fix",
     "clean": "rm -rf lib/* deno/lib/*",
     "build": "yarn run clean && npm run build:cjs && npm run build:esm && npm run build:deno",
-    "build:deno": "node ./deno/build.mjs && cp ./README.md ./deno/lib",
-    "build:esm": "rollup --config rollup.config.js",
-    "build:cjs": "tsc -p tsconfig.cjs.json",
-    "build:types": "tsc -p tsconfig.types.json",
-    "build:test": "tsc -p tsconfig.test.json",
-    "rollup": "rollup --config rollup.config.js",
-    "test:watch": "jest --watch",
-    "test": "jest --coverage",
+    "build:deno": "node ./deno-build.mjs && cp ./README.md ./deno/lib",
+    "build:esm": "rollup --config ./configs/rollup.config.js",
+    "build:cjs": "tsc -p ./configs/tsconfig.cjs.json",
+    "build:types": "tsc -p ./configs/tsconfig.types.json",
+    "build:test": "tsc -p ./configs/tsconfig.test.json",
+    "test:watch": "yarn test:ts-jest --watch",
+    "test": "yarn test:ts-jest",
+    "test:babel": "jest --coverage --config ./configs/babel-jest.config.json",
+    "test:bun": "bun test",
+    "test:vitest": "npx vitest --config ./configs/vitest.config.ts",
+    "test:ts-jest": "npx jest --config ./configs/ts-jest.config.json",
+    "test:swc": "npx jest --config ./configs/swc-jest.config.json",
     "test:deno": "cd deno && deno test",
     "prepublishOnly": "npm run test && npm run build && npm run build:deno",
     "play": "nodemon -e ts -w . -x tsx playground.ts",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/graphql-api-construct",
-  "version": "1.1.3",
+  "version": "1.2.0-amplify-table-preview.0",
   "description": "AppSync GraphQL Api Construct using Amplify GraphQL Transformer.",
   "repository": {
     "type": "git",
@@ -76,26 +76,26 @@
   "dependencies": {
     "@aws-amplify/backend-output-schemas": "^0.2.0-alpha.6",
     "@aws-amplify/backend-output-storage": "^0.1.1-alpha.2",
-    "@aws-amplify/graphql-auth-transformer": "3.1.7",
-    "@aws-amplify/graphql-default-value-transformer": "2.1.6",
-    "@aws-amplify/graphql-function-transformer": "2.1.5",
-    "@aws-amplify/graphql-http-transformer": "2.1.5",
-    "@aws-amplify/graphql-index-transformer": "2.1.6",
-    "@aws-amplify/graphql-maps-to-transformer": "3.2.3",
-    "@aws-amplify/graphql-model-transformer": "2.2.2",
-    "@aws-amplify/graphql-predictions-transformer": "2.1.5",
-    "@aws-amplify/graphql-relational-transformer": "2.1.6",
-    "@aws-amplify/graphql-searchable-transformer": "2.2.2",
-    "@aws-amplify/graphql-transformer": "1.2.3",
-    "@aws-amplify/graphql-transformer-core": "2.2.2",
-    "@aws-amplify/graphql-transformer-interfaces": "3.2.1",
+    "@aws-amplify/graphql-auth-transformer": "3.1.9-amplify-table-preview.0",
+    "@aws-amplify/graphql-default-value-transformer": "2.1.8-amplify-table-preview.0",
+    "@aws-amplify/graphql-function-transformer": "2.1.7-amplify-table-preview.0",
+    "@aws-amplify/graphql-http-transformer": "2.1.7-amplify-table-preview.0",
+    "@aws-amplify/graphql-index-transformer": "2.2.0-amplify-table-preview.0",
+    "@aws-amplify/graphql-maps-to-transformer": "3.2.5-amplify-table-preview.0",
+    "@aws-amplify/graphql-model-transformer": "2.3.0-amplify-table-preview.0",
+    "@aws-amplify/graphql-predictions-transformer": "2.1.7-amplify-table-preview.0",
+    "@aws-amplify/graphql-relational-transformer": "2.2.0-amplify-table-preview.0",
+    "@aws-amplify/graphql-searchable-transformer": "2.2.4-amplify-table-preview.0",
+    "@aws-amplify/graphql-transformer": "1.3.0-amplify-table-preview.0",
+    "@aws-amplify/graphql-transformer-core": "2.3.0-amplify-table-preview.0",
+    "@aws-amplify/graphql-transformer-interfaces": "3.3.0-amplify-table-preview.0",
     "charenc": "^0.0.2",
     "crypt": "^0.0.2",
     "fs-extra": "^8.1.0",
     "graceful-fs": "^4.2.11",
     "graphql": "^15.5.0",
     "graphql-mapping-template": "4.20.12",
-    "graphql-transformer-common": "4.25.1",
+    "graphql-transformer-common": "4.26.0-amplify-table-preview.0",
     "hjson": "^3.2.2",
     "immer": "^9.0.12",
     "is-buffer": "^2.0.5",
@@ -107,7 +107,7 @@
     "pluralize": "^8.0.0",
     "ts-dedent": "^2.0.0",
     "universalify": "^2.0.0",
-    "zod": "^3.21.4"
+    "zod": "^3.22.3"
   },
   "devDependencies": {
     "@types/fs-extra": "^8.0.1",
@@ -162,5 +162,5 @@
       }
     }
   },
-  "gitHead": "58c67c5534f7838371ef64b5ee23f2f406817f70"
+  "gitHead": "7d153ff268ff8e8fab43105b5e9ea6611adfc2dd"
 }

package/src/amplify-graphql-api.ts

@@ -64,12 +64,18 @@ import {
  *
  * For a full reference of the supported custom graphql directives - https://docs.amplify.aws/cli/graphql/directives-reference/
  *
- * The output of this construct is a mapping of L1 resources generated by the transformer, which generally follow the access pattern
+ * The output of this construct is a mapping of L2 or L1 resources generated by the transformer, which generally follow the access pattern
  *
  * ```typescript
  *   const api = new AmplifyGraphQlApi(this, 'api', { <params> });
- *   api.resources.api.xrayEnabled = true;
- *   Object.values(api.resources.tables).forEach(table => table.pointInTimeRecoverySpecification = { pointInTimeRecoveryEnabled: false });
+ *   // Access L2 resources under `.resources`
+ *   api.resources.tables["Todo"].tableArn;
+ *
+ *   // Access L1 resources under `.resources.cfnResources`
+ *   api.resources.cfnResources.cfnGraphqlApi.xrayEnabled = true;
+ *   Object.values(api.resources.cfnResources.cfnTables).forEach(table => {
+ *     table.pointInTimeRecoverySpecification = { pointInTimeRecoveryEnabled: false };
+ *   });
  * ```
  * `resources.<ResourceType>.<ResourceName>` - you can then perform any CDK action on these resulting resoureces.
  */

package/src/internal/codegen-assets.ts

@@ -35,6 +35,11 @@ export class CodegenAssets extends Construct {
     new BucketDeployment(this, `${id}Deployment`, {
       destinationBucket: bucket,
       sources: [Source.data(MODEL_SCHEMA_KEY, props.modelSchema)],
+      // Bucket deployment uses a Lambda that runs AWS S3 CLI to transfer assets to destination bucket.
+      // That Lambda requires higher memory setting to run fast even when processing small assets (less than 1kB).
+      // This setting has been established experimentally. Benchmark can be found in pull request description that established it.
+      // The value has been chosen to prefer the lowest cost (run time * memory demand) while providing reasonable performance.
+      memoryLimit: 1536,
     });
 
     this.modelSchemaS3Uri = getS3UriForBucketAndKey(bucket, MODEL_SCHEMA_KEY);

package/src/internal/construct-exports.ts

@@ -33,6 +33,7 @@ export const getGeneratedResources = (scope: Construct): AmplifyGraphqlApiResour
   const cfnDataSources: Record<string, CfnDataSource> = {};
   const tables: Record<string, Table> = {};
   const cfnTables: Record<string, CfnTable> = {};
+  const cfnAmplifyTables: Record<string, CfnResource> = {};
   const roles: Record<string, Role> = {};
   const cfnRoles: Record<string, CfnRole> = {};
   const functions: Record<string, LambdaFunction> = {};
@@ -77,6 +78,10 @@ export const getGeneratedResources = (scope: Construct): AmplifyGraphqlApiResour
       cfnTables[resourceName] = currentScope;
       return;
     }
+    if (currentScope instanceof CfnResource && currentScope.cfnResourceType === 'Custom::AmplifyDynamoDBTable') {
+      cfnAmplifyTables[resourceName] = currentScope;
+      return;
+    }
     if (currentScope instanceof Role) {
       roles[resourceName] = currentScope;
       return;
@@ -132,6 +137,7 @@ export const getGeneratedResources = (scope: Construct): AmplifyGraphqlApiResour
       cfnFunctionConfigurations,
       cfnDataSources,
       cfnTables,
+      cfnAmplifyTables,
       cfnRoles,
       cfnFunctions,
       additionalCfnResources,

package/src/internal/default-parameters.ts

@@ -16,5 +16,6 @@ export const defaultTranslationBehavior: TranslationBehavior = {
   enableAutoIndexQueryNames: true,
   respectPrimaryKeyAttributesOnConnectionField: true,
   enableSearchNodeToNodeEncryption: false,
+  useAmplifyManagedTableResources: false, // TODO: flip to true once all implementations are finished
   enableTransformerCfnOutputs: false,
 };

package/src/types.ts

@@ -393,12 +393,14 @@ export interface TranslationBehavior {
   readonly respectPrimaryKeyAttributesOnConnectionField: boolean;
 
   /**
-   * If enabled, set nodeToNodeEncryption on the searchable domain (if one exists). Not recommended for use, prefer
-   * to use `Object.values(resources.additionalResources['AWS::Elasticsearch::Domain']).forEach((domain: CfnDomain) => {
-   *   domain.NodeToNodeEncryptionOptions = { Enabled: True };
-   * });
+   * Used for AmplifyGrapqhlApi construct ONLY
+   * If enabled, the table resources will be generated under custom resource provider,
+   * which enables the multiple GSI updates within one deployment phase
    * @default false
+   * @experimental
    */
+  readonly useAmplifyManagedTableResources: boolean;
+
   readonly enableSearchNodeToNodeEncryption: boolean;
 
   /**
@@ -484,6 +486,13 @@ export interface PartialTranslationBehavior {
    * @default false
    */
   readonly enableTransformerCfnOutputs?: boolean;
+
+  /**
+   * When enabled, amplify DynamoDB table will be generated instead of CFN pre-defined DynamoDB table
+   * @default false
+   * @experimental
+   */
+  readonly useAmplifyManagedTableResources?: boolean;
 }
 
 /**
@@ -647,6 +656,11 @@ export interface AmplifyGraphqlApiCfnResources {
    */
   readonly cfnTables: Record<string, CfnTable>;
 
+  /**
+   * The Generated Amplify DynamoDB Table L1 Resources, keyed by model name.
+   */
+  readonly cfnAmplifyTables: Record<string, CfnResource>;
+
   /**
    * The Generated IAM Role L1 Resources, keyed by logicalId.
    */